From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 1 May 2017 01:28:18 +0000 (+0300)
Subject: ; Tighten up vc-state tests, allowed by the previous change
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1546^2~505
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=04f915db9732d275ad1de8add8009c2af9d94d1f;p=emacs.git

; Tighten up vc-state tests, allowed by the previous change
---

diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index ad4399db032..f2898cb6d2c 100644
--- a/test/lisp/vc/vc-tests.el
+++ b/test/lisp/vc/vc-tests.el
@@ -329,8 +329,10 @@ This checks also `vc-backend' and `vc-responsible-backend'."
 	    ;; Write a new file.  Check state.
 	    (write-region "foo" nil tmp-name nil 'nomessage)
 
-            (message "vc-state3 %s" (vc-state tmp-name))
-	    (should (null (vc-state tmp-name)))
+            ;; nil: Mtn
+            ;; unregistered: Bzr CVS Git Hg SVN RCS
+            (message "vc-state3 %s %s" backend (vc-state tmp-name backend))
+	    (should (memq (vc-state tmp-name backend) '(nil unregistered)))
 
 	    ;; Register a file.  Check state.
 	    (vc-register
@@ -348,10 +350,11 @@ This checks also `vc-backend' and `vc-responsible-backend'."
                      'vc-test--unregister-function backend tmp-name)
                     'vc-not-supported)
                 (message "vc-state5 unsupported")
-              ;; nil: Bzr Git Hg RCS
+              ;; unregistered: Bzr Git RCS Hg
               ;; unsupported: CVS Mtn SCCS SRC SVN
-              (message "vc-state5 %s" (vc-state tmp-name))
-              (should (null (vc-state tmp-name))))))
+              (message "vc-state5 %s %s" backend (vc-state tmp-name backend))
+              (should (memq (vc-state tmp-name backend)
+                            '(nil unregistered))))))
 
       ;; Save exit.
       (ignore-errors (run-hooks 'vc-test--cleanup-hook)))))